Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch-to-configuration-ng: update rust-ini to support multi-line INI… #343145

Merged
merged 2 commits into from
Oct 2, 2024

Conversation

jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Sep 19, 2024

… values

Description of changes

Fixes #342642

This updates the rust-ini crate to point to the latest rev of that project, which adds systemd-styled multi-line INI support to the parser.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Comment on lines 15 to 17
rust-ini = { git = "https://github.com/jmbaur/rust-ini", branch = "multi-line", features = [
"inline-comment",
] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any hope of this being upstreamed (presumably as a runtime‐configurable feature)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the goal. I plan on PR'ing it soon. The "inline-comment" feature is actually a feature unrelated to my work, but we need it anyways.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. Note that due to how Cargo unifies features across the dependency tree it’s somewhat dangerous to use them to change behaviour like this, but I guess that’s a problem with the flags this crate has already.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I have a PR for upstream here. @emilazy Assuming I have changes to make to that PR to be acceptable for merging upstream, do you think it would be best to pin to a different branch here with the same changes? I think github keeps unreachable git objects on their end, but might be best to not take that chance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream PR is merged! Updated cargo dependency to point to that rev

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Sep 20, 2024
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Sep 21, 2024
@jmbaur
Copy link
Contributor Author

jmbaur commented Sep 21, 2024

@ofborg test switchTest switchTestNg

@jmbaur jmbaur marked this pull request as ready for review September 21, 2024 02:38
@jmbaur jmbaur force-pushed the stc-ng-rust-ini-updates branch from e0ab6f0 to 07fdff1 Compare September 21, 2024 15:27
@jmbaur jmbaur force-pushed the stc-ng-rust-ini-updates branch from 07fdff1 to f6fed8b Compare September 21, 2024 15:28
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ofborg test switchTest switchTestNg

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 22, 2024
@jmbaur
Copy link
Contributor Author

jmbaur commented Oct 2, 2024

@emilazy is this waiting on anything else or can this get merged?

@emilazy
Copy link
Member

emilazy commented Oct 2, 2024

Nope I just forgot :) LGTM, merging.

@emilazy emilazy merged commit 7033ba8 into NixOS:master Oct 2, 2024
29 of 31 checks passed
@jmbaur jmbaur deleted the stc-ng-rust-ini-updates branch October 2, 2024 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

switch-to-configuration-ng fails to parse escaped newlines
3 participants